This repository has been archived by the owner on Dec 18, 2017. It is now read-only.
Fix GetRelativePath with different volumes #2685
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -86,6 +86,12 @@ public static string GetRelativePath(string path1, string path2, char separator) | |||
| if (Microsoft.Dnx.Runtime.RuntimeEnvironmentHelper.IsWindows) | |||
| { | |||
| compare = StringComparison.OrdinalIgnoreCase; | |||
| // check if paths are on the same volume | |||
| if (string.Equals(path1.Substring(1, 1), ":") && !string.Equals(path1.Substring(0, 2), path2.Substring(0, 2), compare)) | |||
There was a problem hiding this comment.
possible index out of range exception
There was a problem hiding this comment.
Is that the best way to get the drive letter?
BrennanConroy
force-pushed
the
brecon/volume_relative
branch
from
5a9247f
to
a18092d
Compare
|
Updated |
| new object[] { "../folder1/file", "C:\\folder\\file", "C:\\folder1\\file" }, | ||
| new object[] { "H:\\folder\\file", "C:\\folder\\file", "H:\\folder\\file" }, | ||
| new object[] { "folder/file", "C:\\", "C:\\folder\\file" }, | ||
| new object[] { "..\\", "C:\\folder\\file", "C:\\" } |
There was a problem hiding this comment.
Is the result here correct?
BrennanConroy
force-pushed
the
brecon/volume_relative
branch
from
a18092d
to
7ea0bf0
Compare
|
|
Once travis passes
BrennanConroy
force-pushed
the
brecon/volume_relative
branch
from
7ea0bf0
to
f651a80
Compare
BrennanConroy
force-pushed
the
brecon/volume_relative
branch
from
f651a80
to
8ec9f73
Compare
|
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2596
@victorhurdugaci @davidfowl